From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 30 Aug 2011 15:48:29 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2142^2~42
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=6bf3eea4670f9f7a1447c49e8a5c155a45ffc11f;p=emacs.git

Merge from trunk.
---

6bf3eea4670f9f7a1447c49e8a5c155a45ffc11f